(tramp-handle-verify-visited-file-modtime): `visited-file-modtime' now

returns a list of two integers, instead of a cons.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0414859c7eb423b9e25c0530633927e6dde5791b..d9a8d14309a1a80330cad1e4ad4560f996c99342 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2343,7 +2343,14 @@ If it doesn't exist, generate a new one."
                 ;; (HIGH . LOW)?
                 (let ((mt (visited-file-modtime)))
                   (< (abs (tramp-time-diff
-                           modtime (list (car mt) (cdr mt)))) 2)))
+                           modtime
+                           ;; For compatibility, deal with both the old
+                           ;; (HIGH . LOW) and the new (HIGH LOW)
+                           ;; return values of `visited-file-modtime'.
+                           (if (atom (cdr mt))
+                               (list (car mt) (cdr mt))
+                             mt)))
+                     2)))
                (attr
                 (save-excursion
                   (tramp-send-command